Merge remote-tracking branch 'origin/master' into feature/pgtk

author Po Lu <luangruo@yahoo.com>

Wed, 8 Dec 2021 01:03:14 +0000 (09:03 +0800)

committer Po Lu <luangruo@yahoo.com>

Wed, 8 Dec 2021 01:03:14 +0000 (09:03 +0800)
author Po Lu <luangruo@yahoo.com>
Wed, 8 Dec 2021 01:03:14 +0000 (09:03 +0800)
committer Po Lu <luangruo@yahoo.com>
Wed, 8 Dec 2021 01:03:14 +0000 (09:03 +0800)
diff --cc doc/lispref/frames.texi
Simple merge
diff --cc lisp/frame.el
Simple merge
diff --cc lisp/net/browse-url.el
Simple merge
diff --cc src/image.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Wed, 8 Dec 2021 01:03:14 +0000 (09:03 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Wed, 8 Dec 2021 01:03:14 +0000 (09:03 +0800)
		1	2
doc/lispref/frames.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/frame.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/browse-url.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/image.c	patch \|	diff1 \|	diff2 \|	blob \| history